Removed logging and added the new control type for fixed references