Reworked Custom Control based on annotations