Added elements on BaseClass case