Code improvements and some members added to "Base"