Changed spring xml configuration to annotations