Added properties as @Value - need to fix them up though