Added some stuff for future implementation.