refactored for pbc usage

Added some missing attribute declarations and initialisations to comply to made annotations.
Added omitted namespaces for class generation.