Core Update

Updated Core Classes