*Improved Check.java and moved annotations to core