Removed final declarations to improve flexability