Cleaned up Class implementation. Still require some work regarding publish parameters.