Added class and method annotations