@@ -15,14 +15,16 @@
  */
 
 #import "OFObject.h"
 
 @class OFString;
-@class OFArray;
-@class OFDictionary;
-@class OFMutableArray;
-@class OFMutableDictionary;
+#ifndef DOXYGEN
+@class OFArray OF_GENERIC(ObjectType);
+@class OFDictionary OF_GENERIC(KeyType, ObjectType);
+@class OFMutableArray OF_GENERIC(ObjectType);
+@class OFMutableDictionary OF_GENERIC(KeyType, ObjectType);
+#endif
 
 #define OF_APPLICATION_DELEGATE(cls)					\
 	int								\
 	main(int argc, char *argv[])					\
 	{								\
@@ -110,12 +112,12 @@
  * @ref OFApplicationDelegate::applicationDidFinishLaunching.
  */
 @interface OFApplication: OFObject
 {
 	OFString *_programName;
-	OFArray *_arguments;
-	OFDictionary *_environment;
+	OFArray OF_GENERIC(OFString*) *_arguments;
+	OFDictionary OF_GENERIC(OFString*, OFString*) *_environment;
 	int *_argc;
 	char ***_argv;
 @public
 	id <OFApplicationDelegate> _delegate;
 	void (*_SIGINTHandler)(id, SEL);
@@ -126,12 +128,13 @@
 #endif
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly, copy, nonatomic) OFString *programName;
-@property (readonly, copy, nonatomic) OFArray *arguments;
-@property (readonly, copy, nonatomic) OFDictionary *environment;
+@property (readonly, copy, nonatomic) OFArray OF_GENERIC(OFString*) *arguments;
+@property (readonly, copy, nonatomic)
+    OFDictionary OF_GENERIC(OFString*, OFString*) *environment;
 @property (assign) id <OFApplicationDelegate> delegate;
 #endif
 
 /*!
  * @brief Returns the only OFApplication instance in the application.
@@ -150,18 +153,18 @@
 /*!
  * @brief Returns the arguments passed to the application.
  *
  * @return The arguments passed to the application
  */
-+ (OFArray*)arguments;
++ (OFArray OF_GENERIC(OFString*)*)arguments;
 
 /*!
  * @brief Returns the environment of the application.
  *
  * @return The environment of the application
  */
-+ (OFDictionary*)environment;
++ (OFDictionary OF_GENERIC(OFString*, OFString*)*)environment;
 
 /*!
  * @brief Terminates the application with the EXIT_SUCCESS status.
  */
 + (void)terminate OF_NO_RETURN;
@@ -192,18 +195,18 @@
 /*!
  * @brief Returns the arguments passed to the application.
  *
  * @return The arguments passed to the application
  */
-- (OFArray*)arguments;
+- (OFArray OF_GENERIC(OFString*)*)arguments;
 
 /*!
  * @brief Returns the environment of the application.
  *
  * @return The environment of the application
  */
-- (OFDictionary*)environment;
+- (OFDictionary OF_GENERIC(OFString*, OFString*)*)environment;
 
 /*!
  * @brief Returns the delegate of the application.
  *
  * @return The delegate of the application